From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 30 Aug 2011 06:19:35 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~846^2~1^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f00b626d886d32b08aa6fb47e1cee124c1926897;p=emacs.git

Merge from trunk.
---

f00b626d886d32b08aa6fb47e1cee124c1926897